auto merge of #786 : alexcrichton/cargo/update, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 31 Oct 2014 16:55:50 +0000 (16:55 +0000)
committerbors <bors@rust-lang.org>
Fri, 31 Oct 2014 16:55:50 +0000 (16:55 +0000)

Trivial merge